Repository navigation
perf(r54): 把冻结成本批次与 hosted/CPU 诊断重放到 main（合并 #104–#107） - #262
Merged
Merged
Conversation
(cherry picked from fa47eda; 文档条目另行统一提交)
(cherry picked from a7b9685; 文档条目另行统一提交)
(cherry picked from f734d29; 文档条目另行统一提交)
(cherry picked from c76bab0; 文档条目另行统一提交)
(cherry picked from beeb644; 文档条目另行统一提交)
(cherry picked from eed0ab7; 文档条目另行统一提交)
) (cherry picked from f871fd9; 文档条目另行统一提交)
重放到 main 后，通用 Windows 回归作业也会执行 measure 这个 CTest 项，而该作业不安装 experiments/measure 的依赖。native_environment_supported() 在 Windows 上无条件 import psutil，@unittest.skipUnless 的参数又在导入期求值，于是缺依赖变成 ImportError， 整个 measure 项失败。 把 import 包进 try/except 并返回 False：缺少观察器表示「此环境不支持」，decorator 仍然跳过， 而不是让收集阶段报错。装有 psutil 的 r54-cpu 作业行为不变。
This was referenced Oct 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
问题与最终行为
#104 → #105 → #106 → #107是同一目标（#54 冻结字素成本批次与 hosted/CPU 诊断）的四层堆叠 PR，根分支落后 main 398 个提交，栈顶对 main 有 2 处文档冲突（docs/EVIDENCE.md、docs/FEATURES.md），且这两个文件在 main 与分支上已经语义分叉，无法机械重基。本 PR 用「从 main 起新分支 + 逐个 cherry-pick」重建整条栈：
fa47eda→f871fd9）效果等同于把四个堆叠 PR 合成一个可在 main 上直接审阅的变更。
验证
origin/main..HEAD恰好 10 + 1 个提交docs/EVIDENCE.md与docs/FEATURES.md；其余文件（experiments/measure/*、.github/workflows/*、CMakeLists.txt）零冲突应用git show，不是重写：4 条新增行与 FEATURES 行的最终累积版本r54-cost.yml、r54-cpu.yml、core-candidate.yml及完整回归）性能影响（如适用）
本 PR 引入的正是 #54 的性能取证工具链（
experiments/measure/r54_*.py、3 个 workflow），本身不改变产品运行时性能；5% 是环境诊断护栏，不是产品性能容差，#54 的预算仍待用户确认。来源与限制
perf/grapheme-batch-r54、perf/grapheme-hosted-r54、perf/grapheme-cpu-r54、perf/grapheme-cpu-hosted-r54的原提交